Move gtk4-encode-symbolic-svg from gtk-4-examples to libgtk-4-bin

It's more of a development tool than an example.

diff --git a/debian/changelog b/debian/changelog
index f8ef31da97f4bb596ad20d11de78663a93c7b5ee..d6bff9b55439aba9564c9e2c350c08f9aeb4b4b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gtk+4.0 (3.96.0-3) UNRELEASED; urgency=medium
   * debian/libgtk-4-0.symbols.in: Mark more Wayland and Vulkan symbols
     as (arch=linux-any). These don't exist on hurd-i386, and presumably
     not on kFreeBSD either.
+  * Move gtk4-encode-symbolic-svg from gtk-4-examples to libgtk-4-bin.
+    It's more of a development tool than an example.
 
  -- Simon McVittie <smcv@debian.org>  Sun, 28 Jul 2019 10:59:36 +0100
 

diff --git a/debian/control b/debian/control
index 74678fe9ef362ec6a84ff9ceb9a66203fad036de..5bb10c074926521f7520074f35b67f6945989f10 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gtk+4.0
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>
 Build-Depends: adwaita-icon-theme <!nocheck>,
                at-spi2-core <!nocheck>,
                dbus <!nocheck>,
@@ -130,6 +130,8 @@ Depends: gtk-update-icon-cache,
          ${shlibs:Depends},
          libgtk-4-common (>= ${source:Version}),
          libgtk-4-0 (>= ${source:Version})
+Breaks: gtk-4-examples (<< 3.96.0-3~)
+Replaces: gtk-4-examples (<< 3.96.0-3~)
 Description: programs for the GTK graphical user interface library
  GTK is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK is suitable

diff --git a/debian/control.in b/debian/control.in
index a6bc18ff793e5b05ecfe13441a5f91a9fb7a519f..5957245a8d3f44a67fa8928c6089e2cf88c794a7 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -130,6 +130,8 @@ Depends: gtk-update-icon-cache,
          ${shlibs:Depends},
          @COMMON_PKG@ (>= ${source:Version}),
          @SHARED_PKG@ (>= ${source:Version})
+Breaks: @EXAMPLES_PKG@ (<< 3.96.0-3~)
+Replaces: @EXAMPLES_PKG@ (<< 3.96.0-3~)
 Description: programs for the GTK graphical user interface library
  GTK is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK is suitable

diff --git a/debian/gtk-4-examples.install b/debian/gtk-4-examples.install
index 5e4151d4540c9272230811d08730446e3808fe9a..39e346e554971c13524437dc5489fd43277ee892 100644 (file)
--- a/debian/gtk-4-examples.install
+++ b/debian/gtk-4-examples.install
@@ -1,6 +1,5 @@
 usr/bin/gtk4-demo
 usr/bin/gtk4-demo-application
-usr/bin/gtk4-encode-symbolic-svg
 usr/bin/gtk4-icon-browser
 usr/bin/gtk4-widget-factory
 usr/libexec/installed-tests/gtk-4.0
@@ -14,7 +13,6 @@ usr/share/icons/hicolor/*/*/org.gtk.WidgetFactory4*
 usr/share/installed-tests/gtk-4.0
 usr/share/man/*/gtk4-demo-application.*
 usr/share/man/*/gtk4-demo.*
-usr/share/man/*/gtk4-encode-symbolic-svg.*
 usr/share/man/*/gtk4-icon-browser.*
 usr/share/man/*/gtk4-widget-factory.*
 usr/share/metainfo/org.gtk.Demo4.appdata.xml

diff --git a/debian/libgtk-4-bin.install b/debian/libgtk-4-bin.install
index d26262cb463587334d901c0fff13fce1360fd633..641d1d63d7272b2958e403c10dfb8ae3459254bb 100644 (file)
--- a/debian/libgtk-4-bin.install
+++ b/debian/libgtk-4-bin.install
@@ -1,8 +1,10 @@
 usr/bin/gtk4-broadwayd
 usr/bin/gtk4-builder-tool
+usr/bin/gtk4-encode-symbolic-svg
 usr/bin/gtk4-launch
 usr/bin/gtk4-query-settings
 usr/bin/gtk4-update-icon-cache
+usr/share/man/*/gtk4-encode-symbolic-svg.*
 usr/share/man/man1/gtk4-broadwayd.1
 usr/share/man/man1/gtk4-builder-tool.1
 usr/share/man/man1/gtk4-launch.1